Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libc] Exclude FreeListHeap test and fuzzer on GPU #120137

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

petrhosek
Copy link
Member

FreeListHeap uses the _end symbol which conflicts with the _end symbol defined by GPU start.cpp files so for now we exclude the test and the fuzzer on GPU.

FreeListHeap uses the _end symbol which conflicts with the _end symbol
defined by GPU start.cpp files so for now we exclude the test and the
fuzzer on GPU.
@petrhosek petrhosek added the libc label Dec 16, 2024
@petrhosek petrhosek requested review from jhuber6 and lntue December 16, 2024 20:22
@llvmbot
Copy link
Member

llvmbot commented Dec 16, 2024

@llvm/pr-subscribers-libc

Author: Petr Hosek (petrhosek)

Changes

FreeListHeap uses the _end symbol which conflicts with the _end symbol defined by GPU start.cpp files so for now we exclude the test and the fuzzer on GPU.


Full diff: https://github.com/llvm/llvm-project/pull/120137.diff

2 Files Affected:

  • (modified) libc/fuzzing/__support/CMakeLists.txt (+3-1)
  • (modified) libc/test/src/__support/CMakeLists.txt (+3-1)
diff --git a/libc/fuzzing/__support/CMakeLists.txt b/libc/fuzzing/__support/CMakeLists.txt
index 6c750c7f8ed7ac..d4b324db716f68 100644
--- a/libc/fuzzing/__support/CMakeLists.txt
+++ b/libc/fuzzing/__support/CMakeLists.txt
@@ -24,7 +24,9 @@ add_libc_fuzzer(
     -D__LIBC_EXPLICIT_SIMD_OPT
 ) 
 
-if(LLVM_LIBC_FULL_BUILD)
+# TODO: FreeListHeap uses the _end symbol which conflicts with the _end symbol
+# defined by GPU start.cpp files so for now we exclude this fuzzer on GPU.
+if(LLVM_LIBC_FULL_BUILD AND NOT LIBC_TARGET_OS_IS_GPU)
   add_libc_fuzzer(
     freelist_heap_fuzz
     SRCS
diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
index 59bce9b96e3964..aeb8edf305d059 100644
--- a/libc/test/src/__support/CMakeLists.txt
+++ b/libc/test/src/__support/CMakeLists.txt
@@ -55,7 +55,9 @@ if(NOT LIBC_TARGET_OS_IS_GPU)
   )
 endif()
 
-if(LLVM_LIBC_FULL_BUILD)
+# TODO: FreeListHeap uses the _end symbol which conflicts with the _end symbol
+# defined by GPU start.cpp files so for now we exclude this test on GPU.
+if(LLVM_LIBC_FULL_BUILD AND NOT LIBC_TARGET_OS_IS_GPU)
   add_libc_test(
     freelist_heap_test
     SUITE

@petrhosek
Copy link
Member Author

This should address the builder breakage introduced in #119806.

Copy link
Contributor

@jhuber6 jhuber6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tests aren't terribly relevant on the GPU anyway.

@petrhosek petrhosek merged commit 51a0919 into llvm:main Dec 16, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants